Merge branch '2020-05-18-reduce-size-of-common.h'