Merge "Change BLACK to TRANSPARENT to fix test" into rvc-dev