Merge "Fixed apparent copy/paste mistake Bug: 11634373"