[CLC-1636] Security Review Fixes - Collaboration between @christianv and @ctweney