Update for v1.4.0 from rev 7e7496b