Issue #79: Merge back 6.0
Issue #79: Using discovery mode for static addresses