Merge "DO NOT MERGE: Fix ApfTest"