Fixing crop modal bug
Merge branch 'release'