Updates prior to release of 1.8.0