Tagging internal release 2.1.17-39