Merge "Fix ConcurrentModificationException in AcceptOnceConsumer" into tm-qpr-dev