Origin move fix

Merged Uriel Mayo requested to merge originMoveFix into 15.0-stage

Merge request reports