[master] Try to fix API owner bug