8.2.17

MSC #7