Merged static-display-update to master.