Merge branch 'state-update' into 'master'

State update

See merge request !8
5 jobs for master in 4 minutes and 53 seconds (queued for 1 second)