Merged in v2.9 of ShadowChemosh Adjustments