Merge branch 'master' into frac_reg