Merge branch 'hotfix/sort-articles'
fix gotcha top position
Merge branch 'hotfix/gotcha-top-position' into develop