Resolve some sonar code issues
Merge remote-tracking branch 'origin/release/0.1.0' into release/0.1.0