Merge branch 'tfs-stable-2.5.5'