shallow flash branch, need merge Naoki's script
conflict fixed