Merge branch 'state-update' into 'master'

State update

See merge request !8
3 jobs for 18-hemera-tagged-job-doesn-t-start in 52 seconds (queued for 1 second)