PIM-1859 Updated platform