Follow-up work for SoundCloud and Clements and new ticket DATA-1205.