FIX #13448 TIME 00:30 refactoring

2 jobs for develop in 35 seconds (queued for 4 seconds)