iOS CRP Changes

#1071
#1072
#1073
#1075
#1076
#1078