aofs-07 #356 (aofs-07)