changes required for merging in upstream casein