Prep for 1.7.1 config and alignment to release versions