PIM-1573 : update platform branch