CON-1016

*DO NOT MERGE*
Is it required to do so many operations DOM nodes?