save commit
Merge branch 'topic/24_oneshot_migrate' into v1-devel