Merge pull request #809 from micmac1/fs-backport-22.03