Updated to reflect current work for 1.4.2