[#46283725] Refine messages