Merge "Put APV Codec creation under flag" into main