Crm 11320 - make api stable for 4.3