Music: this patch will be squashed prior to push.