Fix when db is not provided, like on sentinels
Merge branch 'sentinel'