final commit for v1.4.0