JR1053 removed NCI from all AC and unit test