Updated changes for 1.7.1 build