Remotes/trunk

There are updates to fix errors found by Parfait static code analysis.