Merge "For tagging Compass4nfv 6.0.0"