Merged zonder-bower with master