manual merge from readonly-korg-master

Change-Id: Id4a09fa11fee4262d9b945369b595644cca6d330