Merge branch 'fix/remove-sharelock-warning-oban-configdb' into 'develop'