WIP on fixing content update
Merge branch 'bootstrap3' into issue-3621
Correctly refresh content preview
Follow up on issue-3621