SCOOSO bugfix: rectify handling of duplicate entry into database
Merge branch 'master' into hitesh/bugfix/general