aofs-08 #563 (aofs-08)