Merge "Enhance APF read/write tests error message" into main