Merge branch '2022-04-23-binman-updates'