Merge branch 'jl/test-pause'