issue03 change7
Revert "issue03 change7"

This reverts commit 5141bed2ae5a0246a7a48e9e906060544f5e66a0.
issue03 change7 on test branch
issue04 change8 on test
Merge branch 'test-branch' into wip/bradtm2000/test