Merge with current public version