Merge branch 'master' into kbandla-issue-template-1