Merge lpw and master after Banquet