Address code review comments and added changelog entry.