Merge "Debug: Add test for bug 31943543"