Merge "Add flag for secure lockdown feature" into main