aofs-08 #628 (aofs-08)