2885/fix issues and feedbacks round 3 #1902

Job	Run time
fetch-deployment	2s
deployment-ios / fastlane-deploy	11m 51s
deployment-android / build	1m 37s
	13m 30s

Provide feedback