Merge "Refactor TCMS by centralizing the request handling logic"