merge changes to 4.5.x