Merge branch 'release/0.0.472' into develop
Okay we don't want no dpulicates now
Merge branch 'develop'