Merge pull request #9031 from nmaggioni/nm_hackrc_f722v2