Merge "Test for bug 13652927" into jb-dev