Merge pull request #9830 from Extarys/actionfade