Please add 18dfa7117a3f37986 to 5.2.x tree