Merge "Implement Placeholder additional property" into devel/master