Merge pull request #620 from knocte/monoservice_playground