removed some unnecessary logic that was used during debugging and fixed
a possible method argument typing error.
Closes #1793
Closes #1792
Merge remote-tracking branch 'tdhatcher/develop' into develop-stripemerge
Merge branch 'develop-stripemerge' into develop
Updated Version 3.0.12.028