Patch 3.3.5a (undocumented changes)