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