(cherry picked from commit 084d756ae6) [ran: adapted to 7.4.x, fixed changelog issue number]
084d756ae6