aofs-08 #614 (aofs-08)