Handle more cropping values usecases (#5191)