Merge branch 'malmo'
merge malmo branch