Merge "Allow control of AVF experiments"