Merge SecurityCenter - Close issue #49