Fixes #3308 - Add compute resource classes