aofs-12 #590 (aofs-12)