Merge branch 'bugid-96446' into dev