Fix PLAT-191

Yes