Merge branch '1.6.4'
SAG Recipe cleanup.
Merge branch 'master' into 1.6.4