[FIX] Service & Components functional fixes

Merged Reviewer Intergaláctico requested to merge 7.0-MOD_SystemComponentsView into 7.0-stage

Merge request reports