story : 2010101 task : 45829 Change-Id: I50a60ada275e49a07f45d97d0c761332031b1098
Update from joo 20241112