Merge "Fix: Resolve a ktlint error in ApfIntegrationTest" into main