Applied patch from dev. Made into bundle.