[rename] [fix] merge related fixes
Merge branch 'master' into edge