aofs-12 #528 (aofs-12)