Merge feature branch into development and submit for release

@msimmons719 I have tested the latest Docker build and it works as expected. Also there are no scan/findings that need to be addressed. Please merge this into development and proceed with release process. #1 (closed)