Create initial ret sservice stub
Merge branch 'master' into develop