388 tests
Merge branch 'issue388' into develop