Merge branch 'next' into feature/album-and-image-links