Merge "Rename ApfConstant to ApfConstants" into main