Sync internal API behavior with product code