GCP-8046
GCP-8076
GCP-8194 - added else
Merge commit '616e26e990f8696e44eae1b49db2dbd4e13417b7' into branch_release_20140410
Merge branch 'master' into branch_release_20140410