Merge in view history code