Restored delete by job group functionality
Merge branch 'rel-v6r8' into integration