Merge branch 'MDL-64757-38_core_output_nested_template_block_string_language' of...