Build #32987213087:   merge prep commits from "fix anchor channel backup" extracted from https://github.com/... on branch master about 9 hours ago

Build #4645936439230464:   follow-up prev: fix test on branch master over 1 year ago