backport ignore_quantity fixes from 3.x, RT#18227