Add section to allow custom setup to be ran during image build
Merge remote-tracking branch 'origin' into bmo