[#46552151] merged tips