Merge master back to develop after vere-v3.5#863

pkova merged 2 commits into

developurbit/vere:developfrom

masterurbit/vere:masterCopy head branch name to clipboard