Update context, smart_ptr from develop.