wip/ritesh/fold security update branches

This MR is for task: https://phabricator.apertis.org/T6584

This is mostly a WIP branch right now because:

• not all features work
• Some don't work because of limitation upstream
• Other's I do have workarounds, but need review/feedback here.

All features work now.