Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev