Merge pull request #5098 from nabinhait/multi_fix6

Multi fixes