aofs-12 #589 (aofs-12)