MOBILE-552 Re-placed functions