12.7 Update (Complete)

Added in merge view for list