Feature/eng 292 maaz mobilefirst copy