Change to checks for source blocks in the painter.
Merge branch 'master' into 1.6.4