Merge "Add test for bug #4970944"