am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev

* commit '89513ee544cd6373496179758e09954af0ba217d':
  Fix projection offset caching - DO NOT MERGE