Merge branch '1415-cleanup-of-pre-processor-macros-ivas-float-update' into 'ivas-float-update'
Cleanup of pre-processor macros in the ivas-float-update branch See merge request !1311
Cleanup of pre-processor macros in the ivas-float-update branch See merge request !1311