Maybe fix #555.
Add test for fix to #555.
Merge branch 'quiesce-fix' into devel