Merge "Fixed for Bug 468."