Merge branch 'shooting-issues'

pulled changes from shooting-issues branch
Merge branch 'shooting-issues'
Merge branch 'shooting-issues'
Merge branch 'shooting-issues'
Merge branch 'shooting-issues'
Merge branch 'shooting-issues'
some changes