revisions to configuration option patch in response to code review