aofs-12 #563 (aofs-12)