Applying fixes that were made on the 3.0.5 Patch stream + bug fixes
2 files changed