fix: rebased with master

4 jobs for !53 with elhalper/add-error-message in 1 minute and 5 seconds (queued for 2 seconds)
latest merge request