Final v1.5.9 changes