Merge branch 'displayed'