Updating Branch 1.4.6-jp with master updates