Merge "Relax APF version check in ApfGenerator" into pi-dev