QAART-304 java update to 1.7
QAART-303 fixes per @bognix