Add conditionals for alias_maps and alias_database
Merge branch 'develop'