Merge "Fix GapWorker crash"