Merge branch 'release/2.4'
Changed usage behavior
Merge branch 'develop'