Merge pull request #773 from micmac1/fs-gcc-12