Thanks for the pull request, looks good to me. Small suggestion, you could remove the documentation fix (related to user_data_xsd) from the commit. Then we could fix it as a dedicated commit and also backport it.
Hi, Changes for user_data_xsd have been reverted.