manual merge from readonly-korg-master

Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548