Merge branch '518738_EntityIds' into dev_0.7