merge pull request canola 3/4

merge canola 3/4