D3/Kunal | Merging UI commons changes
Merge remote-tracking branch 'origin/uicommons'