Merge branch 'levelentity'