Updated autit conditions
Merge branch 'develop'