Added Namespacing. Merge from platform commits (#1739 & #1591)

Added Namespacing. Merged platform commits (#1739 & #1591)