Add save to context with completion closure.
Merge remote-tracking branch 'origin/dev' into dev