aofs-12 #588 (aofs-12)