Changes for final release of 1409.