Fixes for cropconstraints
Merge remote-tracking branch 'flash/2.0.2-beta'