aofs-12 #535 (aofs-12)