Merge feature/popPosts branch into development branch