Merge "Check for null HAT and add logging" into rvc-dev