PRSDK-3125: Update remainig