improve deferred prorate billing with period > 1 month, #22311