Enhanced coverage for core/RDP/gcc