3rd requirements MR for !625 (merged), to be rebased and merged after !641 (merged) and !642 (merged)