Merge commit 'goog/readonly-korg-master' into HEAD