Change Details

Signed-off-by: Minsoo Choo <minsoochoo0122@proton.me>

D54753 is too long. I'm splitting this to make review easier.