PLAT-4993 - Backport regression tests to 2.1.x branch