Merge branch 'ab/workaround-dash-bug-in-test'