feat: replace temporary options with service states
Merge branch 'master' into developer