Merge "Change default ims max retry times" into sc-dev