Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev