Merge "[UUI] Fix for MSB registration entries"