Fix: ref was not set on object after renamed
Merge remote branch 'upstream/develop' into develop