Updated 10.24.17

CF-60-0000-1512