Merge "docs/build-instruction.rst: Cleanup, refactor tags." into stable/brahmaputra