Cleaned codes. Refs #8291.
Resolved conflict. Refs #8291.