fix ConcurrentModification
Merge branch 'master' into FRAMING_REVERSE