Rollback function implemented
Merge remote-tracking branch 'origin/develop' into develop