Fix "return is unnecessary as the last statement in a function with no return value" warning
Fix "Private member is not accessible"
Merge branch 'old-dev' into dev