aofs-12 #595 (aofs-12)