Merge "Adding Helm type Issue-ID: SO-3080"