fix for 5.3
Merge remote-tracking branch 'yunait/master' into saveembeddedrefs