Styling and security context
sherlyn changes and conflicts to be merged
Merged result of cmsAMGAsset conflict