Merge branch 'dom_refactoring'