am b936c57c: (-s ours) am a730881d: Merge "DO NOT MERGE : Fix measuring with...
am b936c57c: (-s ours) am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev
* commit 'b936c57c':
DO NOT MERGE : Fix measuring with outset for orientation