Manually combined ollieflumeland & jemble changes