updates #2: Improve service to meet latest service-commons changes
Merge 'issue-2' to 'develop'. (#2)