Fix and test for trac #17155
Merge branch '17155-me' of github.com:clmath/dojo into 17155-me