Merge "[docs] Fix build warnings, minor alignments"