JNFW-6772

JNFW-6772