Merged in GroupedStructuredData branch. Version no. changed to 5.7
Authored by: girish_c1980 2017-05-03
Parent: [r2354]
Child: [r2356]