Updated 12.26.17

CF-60-0000-1512