GREG-160: Doing some changes because of issues found while testing

7 jobs for GREG-160_error_temporarily_showing in 12 minutes and 56 seconds