aofs-07 #586 (aofs-07)