Potentially update to 1.7 - yet to be tested. Next step is CI.