S2PLAT-2688

S2PLAT-2688