Merge "Changes to maximum gf/arf interval." into experimental