Merge UP1A.230905.019

Merged-In: I67149c6faa2766be6d2537f2315dd2734bdd0447
Change-Id: I5d35bf3f01914320970b64392555617b774cfa38