am 4eefde23: am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev

* commit '4eefde23de23a5e9145a634e843964f6f6eaa6bd':
  Fix projection offset caching - DO NOT MERGE