Changes for 1.5.4 build.