Dev Branch Merge to Master: Test Plan

Raymond Turequested to merge
dev_branch into master

Merging all code and documentation from dev branch to master.

Merge request reports