JBIDE-14299_use_stacks more work to conform to stacks