Master before plat merge - fix merge plat-870