fix for test case issue
Merge branch 'rel-0.12.2' into stable