Merge branch 'amf/8JR9L_element_view_performance' into 0.42.1_staging