Merge "Fix ConcurrentModificationExceptions during binding." into tm-qpr-dev