Fix unique index error
version updates
Merge remote-tracking branch 'origin/development'