Note that for users who run develop, they will need to wait for this MR to be merged into develop for the patches.