Merge "Fix Malformed Table in User Guide docs" into stable/euphrates