Merge "Merge "Apply alternatives to vector refract tests" into nyc-dev am: af5eecc70b...