Fixed NBIA-663-TCIA: CTP issues along with git ignore
Merge remote-tracking branch 'remotes/origin/NBIA-Branch-5.2.1' into TCIA-5_2