Merge pull request #627 from micmac1/21.02-seb-backports