Merge "Refactoring VisualActions" into devel/master