[Commits] 18930c002: Address review input