aofs-12 #523 (aofs-12)