[aquamar] Jama update and ProductLoader NPE fix