UC-1745:  Changed the way we detect RTC target