Merge branch '1953_cppcheck_resleaks'