Backport #1150 to Humble #1610
Description
Since the race condition that was fixed by #1150 still exists on Humble, a backport would be appreciated.
A backport to Iron was approved in #1256 so backporting this fix seems to be doable.
A fix for a somewhat similar race condition was recently approved in #1590 and backported all the way to Humble.