Merge branch 'master' into 1.4.0_wb-126_displayVersion
merge with displayVersion branch