aofs-12 #565 (aofs-12)