Merge branch 'wip/rishi/issue-1073' into 'master'