Merge branch 'dev' into tutorial

Fixed BlackHawk.