Merge branch 'topic/cea861-audio' into topic/misc