DBC 992 - CR fixes 2.