Merge "Add null object checking" into rvc-dev