aofs-12 #542 (aofs-12)