Merge pull request #7686 from remitamine/acast