Merge commit '6b085a3d821306a9b65cebdae19d75597b3c680e' * commit '6b085a3d821306a9b65cebdae19d75597b3c680e': Add better service reporting.