Fix okButNoService label #1127
Merge branch 'master' into new-case-screen