Update 16307c8 and f8a864a