Merge "Fix inverse orientation when original is not applied first." into lmp-dev