Merged service changes from 1.0.3 release