Merge "Stop deprecated parcelables triggering Error FW8"