Oliver has been working on rebasing the feature branch to be cut from a point much closer to current trunk. It should be ready in a day or two max. Please hold off on committing to feature-branch for the next couple of days to give him a chance to finish. Thanks, Maciej