Use ViewContextAction
Merge branch 'develop'