This resolves NB comments US355, US358, US359, US356, and US364
Activity