aofs-12 #572 (aofs-12)