Merge branch 'master' into grind_homo_validate