move patches from crf_dev to common