merge with plomino/github-main upgrades