extra test case
Merge branch 'gh-1414' into dev