Merge pull request #1024 from david22swan/GH-iac-334/main/remove_compatible_code