aofs-12 #555 (aofs-12)