Backports continue-dialog onto v2.1.1