Merged patches

Merged a number of compatibility patches into STEP Patches.