Merge to the latest version

Since 4.6 officially released