Patches for STEP 2.2.7 Core and Extended