Modify property type choicelist initializer so that it only returns user properties.
Merge remote-tracking branch 'origin/master'