Merged teamcity changes into v1.64