Manually merged VIREO-132 down to 1.8.x