Edition 2.1 2017-08 CONSOLIDATED VERSION