test fix for iPhone
Merging origin/nihar/master-pending-testFix3.1 into master