spike(service) - merge from master