Merge changes in master to physics branch