Merge pull request #11446 from SteveCEvans/avgload