Merge "NEW JOB: test-trigger-automation" into devel