JAL-3010 fix up bad merge from develop