FF paint delay
Merge branch 'master' into dev