Updates to build system topic

Reuses: 5f5122292efc35c1bbd911c875f3ad34ad3a8bd3