Merge "Update the ApfIntegrationTest to match the latest VSR-15 requirement" into main