aofs-08 #603 (aofs-08)