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

* commit '45634bf8fb5c9c59217795a620c4a36aced89a03':
  Moving methods which update internal sets on a separate thread