Upgrade to latest release-1.4 code