Merge changes I959fa181,If080c95a,I45edd68e into rel/api_4