[rename] [fix] merge should be passed to on_rename method of controller for further processing
Merge branch 'master' into edge