Address issue with orphan data on the test.
Merge branch 'feature' into develop
Updated Version 3.4.004.006