Changes for 1.8.6 build.