aofs-07 #397 (aofs-07)