Merge remote-tracking branch 'origin/bug/JAL-3002fastPaintWrapped' into develop