JBTM-2260 Updated with latest nexus requirements