Merge "Manual update from a bugbot hidden API comment." into pi-dev