Merging 2024Q2_RC into develop (updating the pipeline that creates docker images for the main branch)
