*HOTFIX* Masonry sometimes called if no cookies
Merge remote-tracking branch 'origin/development'