aofs-12 #538 (aofs-12)