Merge "adding test cases for bug 42353, code will be submitted in a separate review...