Merge branch 'philips/contribution-38-control-metadata-reverb' into 'philips/contribution-38-control-metadata-reverb-draft'