Merge branch 'develop'
Fix display and element count