[PRQ#48677] Merge Request for chirp-hg