Merge branch 'tg/next__improve_soundcloud_support' into next