Patch v.3.9 - General update