Roll in some changes from @craig-willis
Roll in some changes from @craig-willis

bodom0015/ndslabs,craig-willis/ndslabs,craig-willis/ndslabs,craig-willis/ndslabs,craig-willis/ndslabs,bodom0015/ndslabs,bodom0015/ndslabs,bodom0015/ndslabs,nds-org/ndslabs