Incorporate step form changes manually from qflow branch

Because of filename changes, these didn't get merged in the traditional way.