Merge "Remove hints to fixed bug 54044"