Revert "Defect 2908"

This reverts commit 172da3cfc7b39e00d5201ee8dd899c22927eb24b.
Revert "Revert "Defect 2908""

This reverts commit 254ebcffe6ddb07aba221a73913949f9e2ef6859.