Trunk-2809 updated fix and test cases