Resolves: #96604 Related: #96107 Related: #91786 Change-Id: I208e320d6c7c2895bb70fc299317541d60c84131