Merge "Fix Panko API upgrade process" into stable/ocata