Merge remote-tracking branches 'remotes/origin/fix-bootstrap-flash' and 'remotes/origin/refactoring-seeds'
Merge remote-tracking branch 'remotes/origin/ckeditor' & resolve conflicts