Convey Fix
Merge branch 'hotfix/convey1.2'