Resolve #3581893 "Todo fixes"

Closes #3581893

Merge request reports

Loading