3.0.2 WIP

Contains the changes that will be released as part of v3.0.2.