Cut 1.7.4
Formatting to match master