Made build changes equivalent to the changes made in the '1.6.4' branch.