Merge branch 'madhusudancs/issue-2272'