Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev