Fix merge conflicts from master.
Fix a random bug with marks population caused by a background task that is not needed anymore.
Fix a bug in the render progress bar where it would occasionally not clear once the rendering was completed. That was due to the introduction of rendering in a Parallel process.