Merge changes Ia8783de8,I61421095 into stable/gambia