merged in from wipoNew