This should fix the timeouts at stop observed in ATLAS during M1. See https://its.cern.ch/jira/browse/ATR-30913 for more details.