Patch 6.0.2

Move everything for Patch 6.0.2 to Master.