Manual merge of stvs pull request #32