PIM-3535: jj bigup