Merge expression branch into master