Merge branch 'keyprop'