Merge "SidekickService (base)"