Prepped release
Merge branch 'release/3.0.2' into develop