Tuvok CPP11 check added
Merge cleanup