FB10847 - reverted an and condition to try to avoid unnecessary hasPostedDelivery call