Merge "Fix setCapabilities." into pi-dev