This MR is for updating the TMC to the latest version - refer to REL-1380.
It aims to resolve SKB-309.