Manual merge master with remove-cucumber