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