[fixes] fixes in patch
Merge branch 'master' into edge