am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev

* commit 'a730881d769cfe0bdce1faafae2c3b88f86d6978':
  DO NOT MERGE : Fix measuring with outset for orientation