Merge "Resource definition horizontal stepper"