added tangerine service specifics
Merge branch 'master' into tangerine