GCP-8195
GCP-8046
Merge remote-tracking branch 'remotes/origin/branch_release_20140410'