Ajay/Melanie | #3360 | Story - Messages are transalated and persisted and placeholders remain in English