aofs-07 #354 (aofs-07)