Fixed NBIA-663 TCIA: CTP issues and some NBIA-507 UI changes
Fixed NBIA-663-TCIA: CTP issues and some UI changes