Merge "Fix for bug #34905789"