76_Fix_Conflict_for_upstream_update_5_913

issue: https://gitlab.e.foundation/e/os/backlog/-/issues/76

Merge conflict fix to merge upstream/master to master.