Merge branch '454-dirac-cleanup' of...

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