aofs-12 #620 (aofs-12)