In the USA there is an abundance of gypsum so we have always addressed this building material instead of what the rest of the world can manage with. I am aware of a product import from China that replaces the gypsum complete with multiple freeze thaw cycles, water resistant and mold resistant...
Additionally,
A. MATCH. It is important that the "same" system be included and not mixed. In fact, even manufacturers/vendors with similar products do not allow their own products mix and match such as the 2 part epoxy Thermo-Lag to correct the 1 component Firesorb or vice-versa...