Merged with cppcheck