Hotfix/4740

Fix and updated unit tests for Issue #4740