Rollback changes for Conference
Merge remote-tracking branch 'origin/develop' into develop