JBTIS-238 - initial luna pass