Merge "Removal of unnecessary set and map wrappers" into devel/master