Updated infrastructure to use release 1.2.1 branch as well