Cleaned for service library exceptions.
Merge branch 'master' into service-exception-cleanup