Merge branch 'bug/JAL-3166npeAllRowsHidden' into develop