CONTENT-1818 component initialization
CONTENT-1819 - merged changes