4 Commits (cpp17-fixes)