Apply Unicode SDK changes
Apply MMF2.5 SDK changes