Merge new physics into master