Merge setup fix into tag_support branch
1 file changed