Part of DEVELOPER-355

This should fix stacks, the others will be in aweplug