Merge from master, for updated LR4 filters