Merge pull request #2121 from v-vid/master