aofs-11 #623 (aofs-11)