* Merged gc7-branch to default.