General Addon updates

Maintenance updates pre 6.0.2 patch
Patch 6.0.2

Updates for 6.0.2