4 Commits (cpp17-rebased)