Merge !836: sandbox: fix missing default class in resolve() function

27 jobs for nightly
in 10 minutes and 51 seconds and was queued for 10 seconds