Merge "Fix some CppCheck errors" into devel/master