Towards 1.17