refs 5848 for enju_trunk