merge 4.6.0-beta into master