SWC-1722: push lockdown to 10/20