Merge branch 'crend_refactoring_leftovers_cleanup' of forge.3gpp.org:ivas-codec-pc/ivas-codec into crend_refactoring_leftovers_cleanup