Added option to disable cropping.
Merge branch 'proto_data_layer' into paramserver