aofs-11 #563 (aofs-11)