Merge "Bug fix for 3545"