Merge from Medic Mobile repository