Merge "Improve boundary check and test step in testAPFv{2,4,6}GenerateValidProgram." into main