Merge "Moving methods which update internal sets on a separate thread" into ub-now-queens