integrate Cloud9 1.3.2 contribution to 1.4.9 version
integrate Cloud9 1.3.2 contribution to 1.4.9 version