release 1.0.24 ticket #13743, #13572