Including changes for 1.6