maintenance setup changes
Merge branch 'master' into cleaner_tag_history