aofs-07 #405 (aofs-07)