More noTracking/attachEntity/mergeStrategy work