Merge "Fix CSIT for PMSH"