merged local fixes
merged
challngong mobile merge