Merged Upstream into HDOXC