Partially implemented teamcity support changes as requested. WIP.