Optimization of cropping image
Merge branch 'pundit' into pundit-stage