Removed checks on the _options property to allow adding/removing handlers at runtime.
Merge branch 'DataBlockResponseRe2' into development
Merge branch 'LOG-Renames' into development