Merge branch 'bug/JAL-3997_NPE_in_wrapped_mode' into develop