Merge branch 'pc/remove-warn' into maint