JBTIS-87 - sync up w/ core Alpha5