I'll just risk and upload this as release
v5.7