Merge commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03' * commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03': Improvements to manage apps / running services:
Merge commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03' * commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03': Improvements to manage apps / running services: