aofs-12 #527 (aofs-12)