For MBDT Tickets GCP-8516 and GCP-8517