Merge "Fix PRH CSIT in Casa release" into casablanca