Merge "dovetail: conditional steps added to armpod"