Fixes for Jiras:
CISWMI-285 NUTNR cannot get out of Polled state