Part of v1.7