T2 prep for ESE release 23.1 version 2