merge fix for N-selects performance bug in main delivery loop