Merge legacy "develop" branch into "release-1-4-0".