Merge branch 'nsupdate.info-fixes'