aofs-07 #628 (aofs-07)