[TASK] Post-fixing after service unification

This PR will contain a few commits to correct issues arising after the Service unification.