Merge pull request #3225 from stefanpenner/master

add regression coverage for #3221 [closes #3223]
additional coverage for: #3225