Re-Merge branch 'f-state-change' into 'dev'

Summary

Re-merge the feature branch, but with a small fix and an additional unit test.

This is for #217 (closed)

Focus

For this merge, please focus on 2cf7e0e5 and 23d787e8: git diff 4940f585..23d787e8

Test Environment

• make test
• Run the integration tests or check the pipelines.

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related issues
• Up-to-date CHANGELOG.md (or not necessary)
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md (or not necessary)
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.