This PR takes care of all the remaining cases where embedded view definition and insertion points are different. PR Close #24418
This PR takes care of all the remaining cases where embedded view definition and insertion points are different. PR Close #24418