Disable the solve dialog.
Merge branch 'master' into develop