Adding TCs TC12328, TC12330, 12331, 12335, 12344