Import 0.4.3 version in mainstream branch