Merge "Fix capability checking for reject" into nyc-dev