Merge branch 'nd/reject-empty-shallow-request'