Revert "Merge branch 'GONRG-10447-CSP-Specific-Compile-condition' into 'master'" See merge request !1158