Fix bug 958977
WIP cuke reorganization