TeamCity 10.0.4: Labeling failed: java.io.EOFException: Short read of block. Follow

Hi

We recently updated to TeamCity 10.0.4 to enable the fix for this issue: https://youtrack.jetbrains.com/issue/TW-47102  (Also see https://teamcity-support.jetbrains.com/hc/en-us/community/posts/207752345-TeamCity-10-git-fetch-command-failed-session-is-down). The good news is that we no longer get the fetch/checkout error and the build is successful. However, unfortunately we're getting an error on the labeling feature:

[2017-01-04 11:46:53,184] INFO [rmal executor 8] - jetbrains.buildServer.VCS - Labeling VCS root "xxx Web Git SSH" {instance id=49, parent internal id=2, parent id=xxxWeb_xxxWebGitSsh, description: "ssh://yyy:22/tfs/DefaultCollection/_git/xxxWeb#master"}@4096e935ce5c5920d1206c08823764b8ef8ffcf9 for build #0.1.3737.0 {build id=10457, buildTypeId=bt2}

[2017-01-04 11:51:54,434] WARN [rmal executor 8] - jetbrains.buildServer.VCS - Failed to set label 'build.0.1.3737.0' for build #0.1.3737.0 {build id=10457, buildTypeId=bt2}: jetbrains.buildServer.vcs.VcsException: Labeling failed: java.io.EOFException: Short read of block. (enable debug to see stacktrace)

This error also appeared earlier in the log:

[2017-01-04 11:43:19,967]   WARN [rmal executor 4] -      jetbrains.buildServer.VCS - Failed to set label 'build.0.1.3736.0' for build #0.1.3736.0 {build id=10456, buildTypeId=bt2}: jetbrains.buildServer.vcs.VcsException: Labeling failed: org.eclipse.jgit.errors.TransportException: ssh://yyy:22/tfs/DefaultCollection/_git/xxxWeb: error occurred during unpacking on the remote end: error Wait for data timeout elapsed. OnData event failed to be raised within expected time. (enable debug to see stacktrace) 

If it's changed back to the previously configured VCS root that uses basic authentication, then the labeling is applied successfully. 

[2017-01-04 12:25:07,123] INFO [rmal executor 1] - jetbrains.buildServer.VCS - Labeling VCS root "xxx Web Git" {instance id=39, parent internal id=1, parent id=xxx_Web_Git, description: "http://yyy:8080/tfs/DefaultCollection/_git/xxxWeb#master"}@4096e935ce5c5920d1206c08823764b8ef8ffcf9 for build #0.1.3741.0 {build id=10461, buildTypeId=bt2}
...
[2017-01-04 12:25:27,685] INFO [rmal executor 1] - ers.vcs.git.GitLabelingSupport - Tag build.0.1.3741.0=4096e935ce5c5920d1206c08823764b8ef8ffcf9 was pushed with status OK for (C:\ProgramData\JetBrains\TeamCity\system\caches\git\git-5345511D.git,

http://TheUserName@yyy:8080/tfs/DefaultCollection/_git/xxxWeb#master) in 15263ms (prepare pack 10449ms)

(We're still using TFS 2015 Update 3 as before)