Merge "Fix Arch/blueprint Doc formatting" into beijing