aofs-12 #397 (aofs-12)