Merge branch 'release/1.4.0-alpha' into develop