Merge "Fix bug 2516434"