aofs-07 #392 (aofs-07)