Merge "Fix for goat detection code" into rvc-dev