JBTIS-245 - Alpha6 for core Beta3