Initial 1.6.4 config commit.