Implemented this TODO note (last one for ConcurrentArrayList) and added unit tests for it
Merge branch 'master' into unstable_staging