Sync with HDMU fork