Merge "Add APV Support flag" into main