aofs-08 #575 (aofs-08)