Finishing files for v1.17