Test with display problem solved
Merge branch 'unstable'