Merge "Move the "repeated calls" caveat" into pi-dev