cherry pick

I modified master directly which is a major no no.
I rest the head .
I chery picked from dh-20-1 cause it has my sieve.
and how I am submitting a merge with all the good stuff