Merge branch 'bug/JAL-2721fastPaintNPE' into develop