Merge "Rename bundle keys to be prefixed with KEY" into main