Merge branch 'mix/database-vacuum-options' into 'develop'