Merge details
requested review from @fkzheng
assigned to @hh6chen
mentioned in commit 4918e0d4
merged