Backported fix for seasonal address test failures #1149