Changes for editing nested components

STUD-1442