Update stored and other few things.
Resolve merge conflict.