Merge "Placeholder properties as enums" into devel/master