Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1