CAY-1974 | Copy/Paste DbEntity throws exception
Merge branch '40'