aofs-07 #418 (aofs-07)