npo controller fixes
conflict merges