fma dino update
Merge branch 'fma-dino3'