Merge with current picard/master, fix conflicts