JBTIS-248 - Changes for Luna update to JBTIS TP