Merge branch 'Issue-2371145' into 7.x-1.x
Issue #2373287 by estha: Add timeout to visitor context promises.
Merge branch 'Issue-2373287' into develop