dev/core#1670 simpler version using copyCustomFields instead of CopyGeneric