Merge "Restore lockdown setting" into sc-dev