Issue already fixed on 7.x-5.7 Branch