Issue #3510870: Add return types and improve attributes typing

Closes #3510870

Merge request reports

Loading