port new changes to 1.4.7