Committed changes from G1-task.