Build config edits, typo redo.
Merge branch 'release/6.3.0' into devel