Merge changes from upstream puthesis