Merge between internal and opensource version