Renaming the backend storage service to avoid any problem between the time and the event module
Merge remote-tracking branch 'origin/master'