Merge "Prevents a ConcurrentModificationException in Widget" into sc-dev