Add tests about update
Merge remote-tracking branch 'origin/dev' into erik
Add tests in cache
Merge remote-tracking branch 'origin/dev' into erik
fix bug when rebuild in update fusion
Merge remote-tracking branch 'origin/dev' into erik
Merge remote-tracking branch 'origin/erik' into dev