Update to r43794:

Initial shuffle in this section, much more to come in order to improve its flow.
Place pre-build tasks at beginning and format as a procedure.