Revert "Revert "Adding support for v1.4""

This reverts commit 194256539594851aa0ddfbd187d3dcd3c92d7c09.