try using a single return statement everywhere
1.0.0 release
Merge branch 'release/1.0.0' into develop