1 files changed, 8 insertions, 4 deletions
diff --git a/lib/ansible/playbook/block.py b/lib/ansible/playbook/block.py
index e585fb7d..fabaf7f7 100644
--- a/lib/ansible/playbook/block.py
+++ b/lib/ansible/playbook/block.py
@@ -21,25 +21,28 @@ __metaclass__ = type
 
 import ansible.constants as C
 from ansible.errors import AnsibleParserError
-from ansible.playbook.attribute import NonInheritableFieldAttribute
+from ansible.playbook.attribute import FieldAttribute, NonInheritableFieldAttribute
 from ansible.playbook.base import Base
 from ansible.playbook.conditional import Conditional
 from ansible.playbook.collectionsearch import CollectionSearch
-from ansible.playbook.delegatable import Delegatable
 from ansible.playbook.helpers import load_list_of_tasks
-from ansible.playbook.notifiable import Notifiable
 from ansible.playbook.role import Role
 from ansible.playbook.taggable import Taggable
 from ansible.utils.sentinel import Sentinel
 
 
-class Block(Base, Conditional, CollectionSearch, Taggable, Notifiable, Delegatable):
+class Block(Base, Conditional, CollectionSearch, Taggable):
 
     # main block fields containing the task lists
     block = NonInheritableFieldAttribute(isa='list', default=list)
     rescue = NonInheritableFieldAttribute(isa='list', default=list)
     always = NonInheritableFieldAttribute(isa='list', default=list)
 
+    # other fields for task compat
+    notify = FieldAttribute(isa='list')
+    delegate_to = FieldAttribute(isa='string')
+    delegate_facts = FieldAttribute(isa='bool')
+
     # for future consideration? this would be functionally
     # similar to the 'else' clause for exceptions
     # otherwise = FieldAttribute(isa='list')
@@ -377,6 +380,7 @@ class Block(Base, Conditional, CollectionSearch, Taggable, Notifiable, Delegatab
                     if filtered_block.has_tasks():
                         tmp_list.append(filtered_block)
                 elif ((task.action in C._ACTION_META and task.implicit) or
+                        (task.action in C._ACTION_INCLUDE and task.evaluate_tags([], self._play.skip_tags, all_vars=all_vars)) or
                         task.evaluate_tags(self._play.only_tags, self._play.skip_tags, all_vars=all_vars)):
                     tmp_list.append(task)
             return tmp_list