aofs-07 #345 (aofs-07)