Merge branch 't/audioc_cleanups'