Merge pull request #4632 from aydun/4.5-merge