Issue #6823 - Registration and port numbers. (from 1.2)