use java.util.concurrent classes inside the flashmap
Merge branch 'develop_2.9' into develop_2.10