Update smart_ptr, accumulators from develop.