aofs-07 #360 (aofs-07)