Merge branch 'reject-request-fix'