Merge pull request #845 from micmac1/fs-1.10.11-23.05