Changes from code review added to this folder.