Refactor Rki related functions

Merged Olaf Mersmann requested to merge refactor_rki into develop

Merge request reports