Merge branch 'gio-lists-tore-splice-fallback' into 'master'