Merge "Tie Cypress instantiation.template.modal with API backed file"