Merge branch 'yt8531-support'