aofs-07 #627 (aofs-07)