v1.3.4:
Building up to 1.4.0