remove mutex for enterperise and use threads
bump to 2.4.0
Merge branch 'release/2.4.0'