Merge "Improve Rest Service API"