Merge "Support accessibility on embedded hierarchies (3/n)"