Merge "Hidden API bugbot update" into pi-dev