Capture update.
Merge conflicts resolved.
Merge remote-tracking branch 'origin/master' into hotfix/pixel_block_fix
Merge remote-tracking branch 'origin/master' into hotfix/pixel_block_fix
Merge remote-tracking branch 'origin/master' into hotfix/pixel_block_fix
Merge remote-tracking branch 'origin/master' into hotfix/pixel_block_fix
Everything functional again.
Merge conflicts resolved.
Merge branch 'hotfix/pixel_block_fix'