Merge "Add test coverage for bug 1943724"