Merge "Stop throwing when the invalid capability is passed" into main