JBTIS-245 - update for luna master until beta3 arrives