Merge branch 'feature/richtext-checkbox-followups'