Changes for 1.5.5 build.