Adding changes of TC12414