aofs-07 #603 (aofs-07)