Merge "Rename ApfV5Test.kt to ApfTest.kt" into main