[INTERNAL/FIX] base.h
Merge branch 'actual'