Merge "Fixed Builder not allowing nested maps for properties" into devel/master