V1.5.6.x

the commit is b9fa91a0d8eb2c69bd873792ff71b7970907cf12