aofs-12 #368 (aofs-12)