Merge branch 'remove-w=3' into autostaging