Feature/ta17469

DEMO:
  https://dev.zenoss.com/tracint/pastebin/5506
  https://dev.zenoss.com/tracint/pastebin/5508