Merge "fix slow get caps -- DO NOT MERGE" into pi-dev