added to accept merge
removed to accept merge
footnote added to 3.2