Add logging + skip steps that have already been completed (#7093)

Add logging + skip steps that have already been completed (#7093) #3647