Merging tim integration branch into master on Monday