[PRQ#64042] Merge Request for takang-git