Change Details

Addresses feedback from @palys-swm and @def-au1t in D3662. It turned out to be way easier than I expected (if I did it right...)

Addresses feedback from @palys-swm and @def-au1t in D3662. It turned out to be way easier than I expected (if I did it right...) --- Depends on D3702

Addresses feedback from @palys-swm and @def-au1t in D3662. It turned out to be way easier than I expected (if I did it right...) --- Depends on D3702