Merge branch 'lockdown'
v1.17.