aofs-08 #623 (aofs-08)