submodule checkout out from 2.4.0
Merge branch 'unique' into release