Merge branch 'fix/object-reembeds' into 'develop'