[#61602696 #61470186] scenario written, test implementation TBD