Merge "Proper fix for bug 3407633"