[TASK] update to recent Neos master