aofs-07 #435 (aofs-07)