Merge "Fixes Bug 2935"