Delivers 41438505 42635327 42635441 41438617

Also some YARD tweaks that snuck in here.