Numerous changes to adapt the pipeline to the mast conventions. For Ticket #143.