Restore "show missing data" preference
Merge remote-tracking branch: upstream/master