Final decxx corrections to PR 3723
Merge pull request #3744 from ianthomas23/final_decxx_corrections

Final decxx corrections to PR #3723