Merge remote-tracking branch 'remotes/origin/anime-1080p-fix' into testing