Fix merge conflicts
Merge branch 'jonasdekeukelaere-fix-contentblock-positions'