Improve logic in render_block_core_template_part
.
#50636
Merged
render_block_core_template_part
.
#50636