Merge branch 'dev' into allizom
minimal forwarding
smaller
move files around
fixes? what happened during move?