Merge branch '2020-01-17-reduce-size-of-common-h-even-more'