Fix spec
Merge branch 'master' into confirm-dialog-72359348