Merge "RTCD build is bringing old errors to light"