Pull in NST latest changes