Tristan/backport update state changes 1.2

This is a backport of !1070 (merged) in order to fix #919 (closed) in our release branch.

Merge request reports

Loading