[PRQ#37501] Merge Request for mimi-bachoseven-git