Fixes for bugid 99014
Merge branch 'bugid-99014' into dev