Merge "docs:build system updates"