Merge "Fix formatting to '_sha1_', '_date_' where needed"