Merge "Adding hasSystemFeature entry for CSHelper" into main