Merge from image_contrast_feature branch