fix for BugId97615
Merge branch 'bugid97615' into dev