merge plat-870 into live-analytics