Fully commenting bitmapworker
Merge remote-tracking branch 'origin/clean' into clean