Merge "Use apfVersionSupported for ApfFilter data region access control" into main