Issue #3471139: Return type declarations

kuzyawkkrequested to merge
issue/role_expire-3471139:3471139-return-type-declarations into 4.x

Closes #3471139

Merge request reports