Merge tick shuffling branch into master.